diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index efaa49a..e393345 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -152,12 +152,9 @@
 		}
 
 		// Set the next_prev_url to the controller if required but not defined
-		if ($this->show_next_prev === TRUE)
+		if ($this->show_next_prev === TRUE && empty($this->next_prev_url))
 		{
-			if (empty($this->next_prev_url))
-			{
-				$this->next_prev_url = rtrim($this->CI->config->site_url($this->CI->router->class.'/'.$this->CI->router->method), '/').'/';
-			}
+			$this->next_prev_url = rtrim($this->CI->config->site_url($this->CI->router->class.'/'.$this->CI->router->method), '/').'/';
 		}
 	}